Add apartment check and room check in the form