bug fix to only search app data if it is available
always include focus value when soloing