Added code to focus on the building field
Added url without appended Homepage.aspx to url matching scheme