Fixes and issue where layout=null is interpreted as not isset(layout)