Close #153 and Close #176.
Close #153 and Close #176.

Fixed #153 - Removed extra drop-down values
Fixed #176 - Corrected typo in search condition

eecian/Team08-iPeer,eecian/Team08-iPeer,eecian/Team08-iPeer,eecian/Team08-iPeer