Added testing
Changed search form
mcapi fix