Reverted, fixed filter and sort null
Merge branch 'dev' of github.com:Farenheight/Lidkoping-SH into dev