bug fixes, pay by default, layout filters