Converting two buttons to search into one button

**I'm submitting a ...**

- [ ] bug report
- [x] feature request

**Current behavior:**

There are two buttons to search, "By ACode" and "By Place"

**Expected behavior:**

There should have been only one button(one searchbox) to search "ACode" as well as "Place"

**Steps to reproduce:**
Open the application -> You will find two buttons