Fix up queries--current queries are quicker!
Alert dismissal missing from test.