WIP: Get the correct DB column name on filter/ sort by property

#340