Results view works again, partially improved as well