The queries needs update to manage save/release in database, this should be improved, but considered ok for now.