Added multiple categories to api queries and cleaned up some code.