Fix query (#445)
add colors on backoffice screen
They don't need this extra columns on BO screen (#445)
Fix alert message on BO screen
Merge branch 'master' into production