Bug Fixes and Search Added