MenuItem, ListGroup & Boundary queries added