#263 some minor styling of code and chaging when to override search field value