Some cleanup, changed the search in category