Issue #494 fix bug
 Issue #494 bakend logic modification simple search
 Issue #494 remove uneeded class
 Issue #494 fix indentation