Search & Few Bug Fixes