Fix sort/filter
Work on scripts