Added loading and category search