Search work

Fixed one common search field
search logic improved
merged my search work