Minor - format code, adding api_get_self();
Fixing query see BT#7682
Minor - format code.