improve filter logic and fix price and city bugs in order form