Query now interactive
Fixed bug with categories list
Refactoring
Refactoring 2