Made the columns work dynamically for any query, including those with joins which the previous implementation did not handle.