Fix #335 - Change search type