Bug fix (causing search problems)
Removing leftover
Implementation for an Issue #363