Did you plan to move this logic to the Mysql Select decorator?