Second step in preparation of autocomplete functionality

Signed-off-by: Michel <info@1st-setup.nl>