Advanced search now works with systems!