Fixed sorting
Added Search-Fields