Added Search Feature and readying for deploy