Moved queries creation from methods into String constants