fixed empty in queries