Reworking search screen to have sortable columns