performance improvements
fixed search