Do not show hidden results.
Some code redundancy removed.
Cleanup