resolve navbar search and original search plus few other fix