ifmatch and whenmatch are now better