Tweaking components.py search spaces