search and sort added and major bug fixxes
Merge commit 'cbd9747f762020f62517ce59fa7a311b3f19c220'