refs #766 - Implementing default row click
refs #766 - Removed  excessive <if>