more fixes
view refractored
fixed search