Added user-defined columns & filters