Add query helper
Small fix
Minor fix in Project management