[#ADMCON-7: Fixing query]