Added status & type on the search page
removed WS
Fixed entity
Added some code explanations