Fixed system attribute search issue