Aligned field names with LFI
Made gen function names unique to avoid scope issues
LIKE clause now used