fixed search and z-orders
fixed filtering