add check and tests for data presence and hit view