Remove sql criteria to make it works not just for admin user
Remove trailing spaces