Added Search Features