Removed City/Category Combo and added a autocomplete Textfield, refactoring