Mark functionality completed
Improved Search