Added building and room fields for more searching options