Dev

Merge of fap searches