Refactored the query handler
Added number view..