Added media scanner and improved fap searches