use c:choose instead of c:if to prevent duplication of the test
Merge pull request #309 from laszlovandenhoek/master

use c:choose instead of c:if to prevent duplication of the test